Recognize negative column indices as invalid. (#415260, Chris Wilson)

2007-04-28  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkliststore.c (gtk_list_store_set_valist_internal):
        * gtk/gtktreestore.c (gtk_tree_store_set_valist_internal):
        Recognize negative column indices as invalid.  (#415260,
        Chris Wilson)

svn path=/trunk/; revision=17681

diff --git a/ChangeLog b/ChangeLog
index 6dbd9b6d3030460a0bd55939a80177b49154f8b5..6234d67f3cad75315e83817db8fe37099e7bb870 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-28  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkliststore.c (gtk_list_store_set_valist_internal):
+       * gtk/gtktreestore.c (gtk_tree_store_set_valist_internal):
+       Recognize negative column indices as invalid.  (#415260,
+       Chris Wilson)
+
 2007-04-28  Ronald Bultje  <rbultje@ronald.bitfreak.net>
 
        * gdk/quartz/gdkeventloop-quartz.c: (select_thread_func),

diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index e095b05cc7ed903313cf9b3f761df1b5a7d5b482..0d0bed6b9bbfccf6106122c74e6b4abe4a452f31 100644 (file)
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -731,7 +731,7 @@ gtk_list_store_set_valist_internal (GtkListStore *list_store,
       GValue value = { 0, };
       gchar *error = NULL;
 
-      if (column >= list_store->n_columns)
+      if (column < 0 || column >= list_store->n_columns)
        {
          g_warning ("%s: Invalid column number %d added to iter (remember to end your list of columns with a -1)", G_STRLOC, column);
          break;

diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c
index 740b293f4d623823cd5c2081621ccc4d3fd6e8fd..55a89af428ce35778387ffcaa998dd6387cfa7bb 100644 (file)
--- a/gtk/gtktreestore.c
+++ b/gtk/gtktreestore.c
@@ -884,7 +884,7 @@ gtk_tree_store_set_valist_internal (GtkTreeStore *tree_store,
       GValue value = { 0, };
       gchar *error = NULL;
 
-      if (column >= tree_store->n_columns)
+      if (column < 0 || column >= tree_store->n_columns)
        {
          g_warning ("%s: Invalid column number %d added to iter (remember to end your list of columns with a -1)", G_STRLOC, column);
          break;